bitkeeper revision 1.1010.1.13 (40e0366cZLFe2i7OeoPJ8sckG6xSpg)

Yet more rename fixes.

diff --git a/tools/examples/xmdefaults b/tools/examples/xmdefaults
index 311f38e2d058edb4897771ea27b4b8a25b009805..efa56bdc202f62a6e9f8b8b82c4fa85f25abe6a4 100644 (file)
--- a/tools/examples/xmdefaults
+++ b/tools/examples/xmdefaults
@@ -5,9 +5,6 @@
 # This file expects the variable 'vmid' to be set.
 #============================================================================
 
-import sys
-import xenctl.ip
-
 try:
     vmid = int(vmid) # convert to integer
 except:

diff --git a/tools/xen/lib/xend/XendDomain.py b/tools/xen/lib/xend/XendDomain.py
index d1e79a2b7ddba57947b0ac70466b7fb43baf8c0b..3aaf080c36a780d3528e354d64c35048b7dc5615 100644 (file)
--- a/tools/xen/lib/xend/XendDomain.py
+++ b/tools/xen/lib/xend/XendDomain.py
@@ -9,7 +9,6 @@ import sys
 from twisted.internet import defer
 
 import xen.ext.xc; xc = xen.ext.xc.new()
-import xenctl.ip
 
 import sxp
 import XendRoot
@@ -336,9 +335,9 @@ class XendDomain:
         if not dominfo: return None
         return dominfo.get_device_by_index(vif)
 
-    def domain_vif_ip_add(self, dom, vif, ip):
-        dom = int(dom)
-        return xenctl.ip.setup_vfr_rules_for_vif(dom, vif, ip)
+##     def domain_vif_ip_add(self, dom, vif, ip):
+##         dom = int(dom)
+##         return xenctl.ip.setup_vfr_rules_for_vif(dom, vif, ip)
 
     def domain_vbd_ls(self, dom):
         dominfo = self.domain_get(dom)

diff --git a/tools/xen/lib/xend/XendDomainInfo.py b/tools/xen/lib/xend/XendDomainInfo.py
index 05c7ba26b28832866b7e0f5ea6ec7b9f825abc4a..c17109c85aaeab815213d403b9ac9813c718be0b 100644 (file)
--- a/tools/xen/lib/xend/XendDomainInfo.py
+++ b/tools/xen/lib/xend/XendDomainInfo.py
@@ -17,7 +17,7 @@ import os
 from twisted.internet import defer
 
 import xen.ext.xc; xc = xen.ext.xc.new()
-import xenctl.ip
+import xen.util.ip
 
 import sxp
 
@@ -167,14 +167,14 @@ def vif_up(iplist):
         print >> open(IP_NONLOCAL_BIND, 'w'), str(v)
 
     def link_local(ip):
-        return xenctl.ip.check_subnet(ip, '169.254.0.0', '255.255.0.0')
+        return xen.util.ip.check_subnet(ip, '169.254.0.0', '255.255.0.0')
 
     def arping(ip, gw):
         cmd = '/usr/sbin/arping -A -b -I eth0 -c 1 -s %s %s' % (ip, gw)
         print cmd
         os.system(cmd)
         
-    gateway = xenctl.ip.get_current_ipgw() or '255.255.255.255'
+    gateway = xen.util.ip.get_current_ipgw() or '255.255.255.255'
     nlb = get_ip_nonlocal_bind()
     if not nlb: set_ip_nonlocal_bind(1)
     try:

diff --git a/tools/xen/lib/xm/opts.py b/tools/xen/lib/xm/opts.py
index 5b9515215dd3607d65f7cad1f9c8c280e09b074e..eb07936f1e2aee8e313b030e950703087e223fd9 100644 (file)
--- a/tools/xen/lib/xm/opts.py
+++ b/tools/xen/lib/xm/opts.py
@@ -290,6 +290,7 @@ class Opts:
         cmd = '\n'.join(["import sys",
                          "import os",
                          "import os.path",
+                         "import xen.util.ip",
                          "xm_file = '%s'" % defaults,
                          "xm_help = %d" % help ])
         exec cmd in globals, locals

diff --git a/tools/xen/lib/xm/shutdown.py b/tools/xen/lib/xm/shutdown.py
index 7dc81008f1278973eeb61b9bbbff6f8220b96824..aaa354554aba283c9e6274b2214d9cc81c3b4528 100644 (file)
--- a/tools/xen/lib/xm/shutdown.py
+++ b/tools/xen/lib/xm/shutdown.py
@@ -6,7 +6,7 @@ import sys
 import time
 
 from xen.xend.XendClient import server
-from xen.xend.xm.opts import *
+from xen.xm.opts import *
 
 gopts = Opts(use="""[options] [DOM]